--- ./lib/updatewindow.py.orig	2013-10-20 02:31:15.000000000 +0000
+++ ./lib/updatewindow.py	2014-07-14 18:49:36.000000000 +0000
@@ -2,6 +2,7 @@
 import re
 import tempfile
 import locale
+import sys
 
 from gi.repository import Gtk, GLib, Gio, Gdk, GdkPixbuf
 
@@ -10,6 +11,10 @@
 except ImportError:
     SpellChecker = False
 
+_encoding = sys.getfilesystemencoding()
+if _encoding is None:
+    _encoding = 'utf-8'
+
 from constants import SHARED_DATA_FILE
 from accountliststore import AccountColumn
 from plugins.twitter.account import AuthorizedTwitterAccount
@@ -91,7 +96,7 @@
         self._set_ui(gui, entry, icon)
 
         user = entry['user_name']
-        self.update_window.set_title(_('Reply to %s') % user.decode('utf-8'))
+        self.update_window.set_title(_('Reply to %s') % user.decode(_encoding))
         self.text_buffer.set_text(self._get_all_mentions_from(entry))
 
         self.update_window.present()
@@ -139,7 +144,7 @@
 
     def on_button_tweet_clicked(self, button):
         start, end = self.text_buffer.get_bounds()
-        status = self.text_buffer.get_text(start, end, False).decode('utf-8')
+        status = self.text_buffer.get_text(start, end, False).decode(_encoding)
 
         account_obj = self.account_combobox.get_account_obj()
         account_source = self.account_combobox.get_account_source()
@@ -201,7 +206,7 @@
     def on_textbuffer_changed(self, text_buffer):
         start, end = self.text_buffer.get_bounds()
 
-        status = self.text_buffer.get_text(start, end, False).decode('utf-8')
+        status = self.text_buffer.get_text(start, end, False).decode(_encoding)
         status = self.http_re.sub("*"*self.config.short_url_length, status)
         status = self.https_re.sub("*"*self.config.short_url_length_https, status)
 
